From 97955c18287abea8c97b281cc5d76e77720b6a1a Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 1 Jul 2022 20:51:28 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 528824 -> 529543 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index c68c46ed67b..009c3bdff2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -860,7 +860,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index e0b98254d42711f0fb39814c92326b7224150f5a..4a594b429079cf3a64bbafc230f0e254ffaae3c4 100644
GIT binary patch
delta 556
zcmdn7SfPETLc<ouy{Wuh3P2E@l~|UTlAk<zLy6e*<`hOjcBsJggDH$saL%I?Ms*f1
zpwj7lsf@~;P&EoElj}Z;O%F(AWPwXcPA^Jj)SP~K0;A&e_hF1ea3f}?FsjLe?TppY
zf!JN1S&|VCHOsa#wK%qYT`D6GGXXL4_I0T&sj`Bpd5K9msqy(K*-8qEwhDRq)9p)H
zw5Cr8XXBV|-^}7A&Y78}P?B0)qM)RLY~JLBf-=)5HnSK{KhVr#GWnJ;&-6ddENasg
zs#!RutF^F5PoLGxBs2ZMbr!Da@hvP;(_e33;h!uZ#WP(YfQ5DXlol58=>j)c#HR0T
zVKJPpQNk)d{X-Q{ZGZ!d`s4snmgx=Cm^h|SXk_7?ZrsXZ01}$~L7Zi}LoW-<^z>F1
z+3B<WftG-|lUrGIr@K_MNKC#b%rX5!D~s*)59L5-@V2o?s(@kv1ky6OI2BTJic`5b
zITcFtic?Dzyd1+EUHqN7IHwmJV-*oV6->*VZrjEpC64euRJmucyO)dqbVo~OQB|P1
o=(@NZo#TT;oq|I&pz1ZJE0(e-wO6#U05K~Nvu&?vV|VBV02HgUr~m)}

delta 229
zcmZo)sjy?QLc<ouy{YYS>5M?k1jNkS<I-8eWT(GvU{RU=zJ(=da*Yhfbb%Ze*6Ee4
zEPB(Ob66y%A8rK_H90Io(?7Pd$V?Y(W09YJI)_DMdjBmJuIXWIEK<{VUu5E&eqad`
z@AL_6EaKB2TxH~&zPF9VaJs~OcEQOTq<JUD`w2}KaAIMZ{@^<!$8@hk7T)Rp?JNe<
z+uK<brynR};h%oIoke%Ln>&-hbde4gTVXH9Fh>`EXU|}FFCb;BRGC^l{h<Pz=ycgm
b7S8FrJ6I&!)jC;#m=%cGwySlrCw2n>SP)P4

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 6477ad71e8c..c23343a027e 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 0ffc004d871..8062fce1e48 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2